From a009d9ade0eb3e877d39ea32eb021cd770182ed3 Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 12 Feb 2004 04:27:53 +0000 Subject: [PATCH] Let smplrout and csv_util work with multi-mode stuff. From gtoevan@gmx.net. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@703 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/csv_util.c | 14 +++----------- gpsbabel/smplrout.c | 5 +---- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c index f50717445..85dd77ef2 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.c @@ -849,17 +849,9 @@ xcsv_data_write(void) fprintf(xcsv_file.xcsvfp, "%s", xcsv_file.record_delimiter); } - switch (global_opts.objective ) { - case wptdata: - waypt_disp_all(xcsv_waypt_pr); - break; - case rtedata: - case trkdata: - route_disp_all(xcsv_noop,xcsv_noop,xcsv_waypt_pr); - break; - default: - break; - } + waypt_disp_all(xcsv_waypt_pr); + route_disp_all(xcsv_noop,xcsv_noop,xcsv_waypt_pr); + track_disp_all(xcsv_noop,xcsv_noop,xcsv_waypt_pr); /* output epilogue lines, if any. */ QUEUE_FOR_EACH(&xcsv_file.epilogue, elem, tmp) { diff --git a/gpsbabel/smplrout.c b/gpsbabel/smplrout.c index 90f188263..401317798 100644 --- a/gpsbabel/smplrout.c +++ b/gpsbabel/smplrout.c @@ -218,6 +218,7 @@ void routesimple_process( void ) { route_disp_all( routesimple_head, routesimple_tail, routesimple_waypt_pr ); + track_disp_all( routesimple_head, routesimple_tail, routesimple_waypt_pr ); } void @@ -226,10 +227,6 @@ routesimple_init(const char *args) { count = 0; - if ( global_opts.objective != rtedata && - global_opts.objective != trkdata ) { - fatal(MYNAME ": This filter only works in route (-r) mode."); - } if (countopt) { count = atol(countopt); } -- 2.30.2